tests: use our own generated libtool, not the one in $PATH

libtoolize creates a version of libtool for the right architecture
in $(top_builddir), which is guaranteed to be present, and is
guaranteed to match what we are compiling (even during
cross-compilation).

Packaging systems sometimes separate /usr/bin/libtool, which is
specific to one architecture, from the libtool development files
such as libtoolize and ltmain.sh, which are architecture-independent.
For example, in Debian, libtool_*_all.deb contains the files necessary
to libtoolize a package and is depended on by the dh-autoreconf package,
but libtool-bin_*_amd64.deb (or whatever architecture) contains
/usr/bin/libtool and is not normally necessary to depend on.

Signed-off-by: Simon McVittie <smcv@debian.org>
Closes: #367
Approved by: cgwalters

diff --git a/Makefile-tests.am b/Makefile-tests.am
index 80903071c5be599a12ef0c5daf6e92c31326f5a7..25b8202f98553e71c250a073759068171c205dc8 100644 (file)
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -245,7 +245,7 @@ ALL_LOCAL_RULES += tests/libreaddir-rand.so
 CLEANFILES += tests/libreaddir-rand.so tests/ostree-symlink-stamp tests/ostree
 
 tests/ostree-symlink-stamp: Makefile
-       @real_bin=`cd $(top_builddir) && libtool --mode=execute echo ostree`; \
+       @real_bin=`cd $(top_builddir) && ./libtool --mode=execute echo ostree`; \
        ln -sf "$${real_bin}" tests/ostree; \
        touch $@